Add tokenpath parameter to collector #1077
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
john-david3
added
the
v3.x
aphralG
reviewed
May 29, 2025
internal/config/config_test.go
Outdated
| //go:embed testdata/nginx-agent-with-token.conf | ||
| var agentConfigWithToken string | ||
|
|
||
| func getAgentConfigWithToken(token string) string { |
There was a problem hiding this comment.
Could this be moved to /agent/test/config/nginx_config.go
dhurley
reviewed
Jun 4, 2025
internal/config/config.go
Outdated
| @@ -871,6 +871,7 @@ func processOtlpReceivers(tlsConfig *OtlpTLSConfig) error { | |||
| func resolveExtensions() Extensions { | |||
| var health *Health | |||
| var headersSetter *HeadersSetter | |||
There was a problem hiding this comment.
I think we should add a new FilePath field to the Header struct instead of putting file paths in the Value field.
dhurley
reviewed
Jun 5, 2025
internal/config/config.go
Outdated
| if headersSetter != nil { | ||
| token, err := getToken(headersSetter) | ||
| if err != nil { | ||
| slog.Error("error getting token from config", "error", err) |
There was a problem hiding this comment.
Suggested change
| slog.Error("error getting token from config", "error", err) | |
| slog.Error("Unable to get token from collector headers setter config", "error", err) |
internal/config/config.go
Outdated
| func getToken(headersSetter *HeadersSetter) (string, error) { | ||
| var err error | ||
|
|
||
| token := headersSetter.Headers[0].Value |
There was a problem hiding this comment.
We have to handle the case where there are more than one header so you will need to loop through the list and check the Value and FilePath for each one
There was a problem hiding this comment.
If there are multiple, which one do we use?
craigell
approved these changes
Jun 6, 2025
dhurley
approved these changes
Jun 6, 2025
internal/config/config.go
Outdated
| return Extensions{ | ||
| Health: health, | ||
| HeadersSetter: headersSetter, | ||
| } | ||
| } | ||
|
|
||
| func values(headers []Header) []Header { |
There was a problem hiding this comment.
Could you rename the function to something like updateHeaders?
aphralG
approved these changes
Jun 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
header-setterparameter of the agent configresolveExtensionsmethodChecklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTINGdocumentmake install-toolsand have attached any dependency changes to this pull requestREADME.md)